|
|
|
@@ -79,18 +79,18 @@ module Agents
|
|
79
|
79
|
end
|
|
80
|
80
|
# Check integer variables:
|
|
81
|
81
|
if options['expected_update_period_in_days'].present?
|
|
82
|
|
- begin
|
|
83
|
|
- Integer(options['expected_update_period_in_days'])
|
|
84
|
|
- rescue
|
|
85
|
|
- errors.add(:base, "Invalid expected_update_period_in_days format")
|
|
86
|
|
- end
|
|
87
|
|
- end
|
|
|
82
|
+ begin
|
|
|
83
|
+ Integer(options['expected_update_period_in_days'])
|
|
|
84
|
+ rescue
|
|
|
85
|
+ errors.add(:base, "Invalid expected_update_period_in_days format")
|
|
|
86
|
+ end
|
|
|
87
|
+ end
|
|
88
|
88
|
if options['uniqueness_look_back'].present?
|
|
89
|
|
- begin
|
|
90
|
|
- Integer(options['uniqueness_look_back'])
|
|
91
|
|
- rescue
|
|
92
|
|
- errors.add(:base, "Invalid uniqueness_look_back format")
|
|
93
|
|
- end
|
|
|
89
|
+ begin
|
|
|
90
|
+ Integer(options['uniqueness_look_back'])
|
|
|
91
|
+ rescue
|
|
|
92
|
+ errors.add(:base, "Invalid uniqueness_look_back format")
|
|
|
93
|
+ end
|
|
94
|
94
|
end
|
|
95
|
95
|
end
|
|
96
|
96
|
|
|
|
|
@@ -185,13 +185,13 @@ module Agents
|
|
185
|
185
|
|
|
186
|
186
|
def previous_payloads(num_events)
|
|
187
|
187
|
if options['uniqueness_look_back'].present?
|
|
188
|
|
- look_back = options['uniqueness_look_back'].to_i
|
|
|
188
|
+ look_back = options['uniqueness_look_back'].to_i
|
|
189
|
189
|
else
|
|
190
|
|
- # Larger of UNIQUENESS_FACTOR*num_events and UNIQUENESS_LOOK_BACK
|
|
191
|
|
- look_back = UNIQUENESS_FACTOR*num_events
|
|
192
|
|
- if look_back < UNIQUENESS_LOOK_BACK
|
|
193
|
|
- look_back = UNIQUENESS_LOOK_BACK
|
|
194
|
|
- end
|
|
|
190
|
+ # Larger of UNIQUENESS_FACTOR*num_events and UNIQUENESS_LOOK_BACK
|
|
|
191
|
+ look_back = UNIQUENESS_FACTOR*num_events
|
|
|
192
|
+ if look_back < UNIQUENESS_LOOK_BACK
|
|
|
193
|
+ look_back = UNIQUENESS_LOOK_BACK
|
|
|
194
|
+ end
|
|
195
|
195
|
end
|
|
196
|
196
|
events.order("id desc").limit(look_back) if options['mode'].to_s == "on_change"
|
|
197
|
197
|
end
|